Changes to v1.1: